From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Dec 2010 17:18:55 +0000 (-0800)
Subject: ChangeLog merge fix.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5402
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=80037c0d10837f25d4190f6c187057103aea8fff;p=emacs.git

ChangeLog merge fix.
---

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ba4af633618..33f830458ca 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -26,7 +26,6 @@
 	(Windows Startup): New node.  Move the stuff about the current
 	directory from "Windows HOME".
 
-2010-12-13  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
 2010-11-27  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
 
 	* maintaining.texi (VC With A Locking VCS, VC Directory Commands):